Add URL struct #519
Merged
Add URL struct #519
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Combine uri + rawuri into single struct. Try to improve ownership around URIs and URI-like things. - cookie & request can take *const std.Uri (TODO: make them aware of the new URL struct?) - Location (web api) should own its URL (web api URL) - Window should own its Location Most of these changes result in (a) a cleaner Page and (b) not having to carry around 2 nullable objects (URI and rawuri).
krichprollsch
approved these changes
Apr 9, 2025
| const href = (try parser.elementGetAttribute(element, "href")) orelse return null; | ||
| var buf = try allocator.alloc(u8, 1024); | ||
| return .{ .navigate = try std.Uri.resolve_inplace(self.uri, href, &buf) }; | ||
| } |
Member
There was a problem hiding this comment.
This deletion is not relative to the PR isn't it? you are preparing the change in #516?
Collaborator
Author
There was a problem hiding this comment.
Yes, this function returns a std.Uri, which gets converted to a string in input.clickNavigate, then back into a uri by page.navigate. Since this code isn't currently being used, and it'll get removed anyways, I didn't want to bother making it work with the new URL.
|
|
||
| switch (click_result) { | ||
| .navigate => |uri| try clickNavigate(cmd, uri), | ||
| } |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pagecurrently contains 5 URL-ish related fields:This PR adds a new URL struct which contains both the raw string and the
std.Uri, and encapsulates some of thestd.UriAPI. It also tries to clean up some of the ownership. For example,pageno longer has alocationfield. Instead, the window owns the location. Similarly,pageno longer has aurlfield, the location now owns its url.I original made http/client.zig and storage/cookie.zig use the new URL struct, but I backed away from that change in this PR. However, I did change those two classes to use
*const std.Urirather than astd.Uri, again to try to clean up ownership.I think there's more cleanup we can do around URI - the
std.UriAPI isn't great - so starting to encapsulate access through this custom struct is the first step.